gtk/Makefile.am add a single-include header for the unix print stuff.

2008-05-29  Michael Natterer  <mitch@imendio.org>

	* gtk/Makefile.am
	* gtk/gtkunixprint.h: add a single-include header for the unix
	print stuff.

	* gtk/gtkpagesetupunixdialog.h
	* gtk/gtkprinter.h
	* gtk/gtkprintjob.h
	* gtk/gtkprintunixdialog.h: add single-include guards that #error
	out if GTK_DISABLE_SINGLE_INCLUDES is defined and any of these
	files is included individually.

	* gtk/gtkprintbackend.h
	* gtk/gtkprinter-private.h
	* modules/printbackends/cups/gtkprintbackendcups.c
	* modules/printbackends/cups/gtkprintercups.h
	* modules/printbackends/lpr/gtkprintbackendlpr.c
	* tests/buildertest.c
	* tests/defaultvaluetest.c
	* docs/tools/widgets.c: include <gtk/gtkunixprint.h> instead of
	individual files.

svn path=/trunk/; revision=20230

diff --git a/ChangeLog b/ChangeLog
index 0c551842e9862dded3b5be6bf56491fd3c1a9551..0aa92cf8be3459b68c97c61b3cad398e2cc290ba 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,26 @@
+2008-05-29  Michael Natterer  <mitch@imendio.org>
+
+       * gtk/Makefile.am
+       * gtk/gtkunixprint.h: add a single-include header for the unix
+       print stuff.
+
+       * gtk/gtkpagesetupunixdialog.h
+       * gtk/gtkprinter.h
+       * gtk/gtkprintjob.h
+       * gtk/gtkprintunixdialog.h: add single-include guards that #error
+       out if GTK_DISABLE_SINGLE_INCLUDES is defined and any of these
+       files is included individually.
+
+       * gtk/gtkprintbackend.h
+       * gtk/gtkprinter-private.h
+       * modules/printbackends/cups/gtkprintbackendcups.c
+       * modules/printbackends/cups/gtkprintercups.h
+       * modules/printbackends/lpr/gtkprintbackendlpr.c
+       * tests/buildertest.c
+       * tests/defaultvaluetest.c
+       * docs/tools/widgets.c: include <gtk/gtkunixprint.h> instead of
+       individual files.
+
 2008-05-28  Michael Natterer  <mitch@imendio.com>
 
        * gtk/gtk*.h: whitespace cleanup: remove trailing whitespace and

diff --git a/docs/tools/widgets.c b/docs/tools/widgets.c
index 1620e20feb32b91835861ae68b7e6494cb899696..9abeb2797a439e2eaecc0dc618ba224484166163 100644 (file)
--- a/docs/tools/widgets.c
+++ b/docs/tools/widgets.c
@@ -1,5 +1,4 @@
-#include <gtk/gtkprintunixdialog.h>
-#include <gtk/gtkpagesetupunixdialog.h>
+#include <gtk/gtkunixprint.h>
 #include <gdk/gdkkeysyms.h>
 #include <X11/Xatom.h>
 #include <gdkx.h>

diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index ec01ca06cc843b096cda9263687ccf82a21e068a..1285f3bd80def3d9b62a0ec3618172317b95e839 100644 (file)
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -337,7 +337,8 @@ gtk_unix_print_public_h_sources =    \
        gtkpagesetupunixdialog.h        \
        gtkprintunixdialog.h            \
        gtkprinter.h                    \
-       gtkprintjob.h
+       gtkprintjob.h                   \
+       gtkunixprint.h
 endif
 
 # Installed header files without compatibility guarantees

diff --git a/gtk/gtkpagesetupunixdialog.h b/gtk/gtkpagesetupunixdialog.h
index 6590899a2d83f28082b1db2f72ce58972f2a5b15..81dc3f43c2a8f4e658c88a3f23347f65fb77daa4 100644 (file)
--- a/gtk/gtkpagesetupunixdialog.h
+++ b/gtk/gtkpagesetupunixdialog.h
@@ -17,6 +17,10 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_UNIX_PRINT_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtkunixprint.h> can be included directly."
+#endif
+
 #ifndef __GTK_PAGE_SETUP_UNIX_DIALOG_H__
 #define __GTK_PAGE_SETUP_UNIX_DIALOG_H__
 

diff --git a/gtk/gtkprintbackend.h b/gtk/gtkprintbackend.h
index 45afe7b05750fa060e7bdf7bb20bf7d2d69a2931..a33f6d80fe961f30bf91de9d5b6f0179a8ced7b3 100644 (file)
--- a/gtk/gtkprintbackend.h
+++ b/gtk/gtkprintbackend.h
@@ -22,18 +22,16 @@
 #define __GTK_PRINT_BACKEND_H__
 
 /* This is a "semi-private" header; it is meant only for
- * alternate GtkPrintDialog backend modules; no stability guarantees 
+ * alternate GtkPrintDialog backend modules; no stability guarantees
  * are made at this point
  */
 #ifndef GTK_PRINT_BACKEND_ENABLE_UNSUPPORTED
 #error "GtkPrintBackend is not supported API for general use"
 #endif
 
-#include <cairo.h>
 #include <gtk/gtk.h>
-
-#include "gtkprinteroptionset.h"
-#include "gtkprintjob.h"
+#include <gtk/gtkunixprint.h>
+#include <gtk/gtkprinteroptionset.h>
 
 G_BEGIN_DECLS
 

diff --git a/gtk/gtkprinter-private.h b/gtk/gtkprinter-private.h
index c5faece1b5a6e1c9f7dde80df4bd5161db89ce51..39165bd9b50d5bb810f3859090dbd994bd80f341 100644 (file)
--- a/gtk/gtkprinter-private.h
+++ b/gtk/gtkprinter-private.h
@@ -22,9 +22,8 @@
 #define __GTK_PRINTER_PRIVATE_H__
 
 #include <gtk/gtk.h>
-#include "gtkprinter.h"
+#include <gtk/gtkunixprint.h>
 #include "gtkprinteroptionset.h"
-#include "gtkprintjob.h"
 
 G_BEGIN_DECLS
 

diff --git a/gtk/gtkprinter.h b/gtk/gtkprinter.h
index 6595bf1bea2a0a92198d8af74d5ea423f701e265..1eb5bd1bf998a706577d8777d8518fcc63526246 100644 (file)
--- a/gtk/gtkprinter.h
+++ b/gtk/gtkprinter.h
@@ -17,6 +17,10 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_UNIX_PRINT_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtkunixprint.h> can be included directly."
+#endif
+
 #ifndef __GTK_PRINTER_H__
 #define __GTK_PRINTER_H__
 

diff --git a/gtk/gtkprintjob.h b/gtk/gtkprintjob.h
index 86ad47a2cc5c5f0d11ee172bd5cd5bcb74fcb14e..1edf2536653482f4a1cd7c3f627f78df56ee7f82 100644 (file)
--- a/gtk/gtkprintjob.h
+++ b/gtk/gtkprintjob.h
@@ -17,6 +17,10 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_UNIX_PRINT_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtkunixprint.h> can be included directly."
+#endif
+
 #ifndef __GTK_PRINT_JOB_H__
 #define __GTK_PRINT_JOB_H__
 

diff --git a/gtk/gtkprintunixdialog.h b/gtk/gtkprintunixdialog.h
index 55c714bce0f21ec624ee95550ef7ce5569f45b1c..47869c152611950886b8c48a46cf031237be984b 100644 (file)
--- a/gtk/gtkprintunixdialog.h
+++ b/gtk/gtkprintunixdialog.h
@@ -17,6 +17,10 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_UNIX_PRINT_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtkunixprint.h> can be included directly."
+#endif
+
 #ifndef __GTK_PRINT_UNIX_DIALOG_H__
 #define __GTK_PRINT_UNIX_DIALOG_H__
 

diff --git a/gtk/gtkunixprint.h b/gtk/gtkunixprint.h
new file mode 100644 (file)
index 0000000..69ca7d5
--- /dev/null
+++ b/gtk/gtkunixprint.h
@@ -0,0 +1,31 @@
+/* GtkUnixPrint
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.         See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+#ifndef __GTK_UNIX_PRINT_H__
+#define __GTK_UNIX_PRINT_H__
+
+#define __GTK_UNIX_PRINT_H_INSIDE__
+
+#include <gtk/gtkpagesetupunixdialog.h>
+#include <gtk/gtkprinter.h>
+#include <gtk/gtkprintjob.h>
+#include <gtk/gtkprintunixdialog.h>
+
+#undef __GTK_UNIX_PRINT_H_INSIDE__
+
+#endif /* __GTK_UNIX_PRINT_H__ */

diff --git a/modules/printbackends/cups/gtkprintbackendcups.c b/modules/printbackends/cups/gtkprintbackendcups.c
index d061bc7ceea3095caed22e0e4e68db1705f32176..ff623cf992238caacf41902a2deaf9487f897763 100644 (file)
--- a/modules/printbackends/cups/gtkprintbackendcups.c
+++ b/modules/printbackends/cups/gtkprintbackendcups.c
@@ -41,7 +41,7 @@
 
 #include <gtk/gtk.h>
 #include <gtk/gtkprintbackend.h>
-#include <gtk/gtkprinter.h>
+#include <gtk/gtkunixprint.h>
 #include <gtk/gtkprinter-private.h>
 
 #include "gtkprintbackendcups.h"

diff --git a/modules/printbackends/cups/gtkprintercups.h b/modules/printbackends/cups/gtkprintercups.h
index 7e2734703f277b150f8a4d9766c465e20f700b9c..6f1c00d452718b2b485da9ae38a30763177bf37a 100644 (file)
--- a/modules/printbackends/cups/gtkprintercups.h
+++ b/modules/printbackends/cups/gtkprintercups.h
@@ -24,7 +24,7 @@
 #include <cups/cups.h>
 #include <cups/ppd.h>
 
-#include "gtkprinter.h"
+#include <gtk/gtkunixprint.h>
 
 G_BEGIN_DECLS
 

diff --git a/modules/printbackends/lpr/gtkprintbackendlpr.c b/modules/printbackends/lpr/gtkprintbackendlpr.c
index a737ba4a16f85d816ec826c8fa1b67184c50d00c..78f189a1008fc305207b14416ab1d0ef0109073e 100644 (file)
--- a/modules/printbackends/lpr/gtkprintbackendlpr.c
+++ b/modules/printbackends/lpr/gtkprintbackendlpr.c
@@ -34,7 +34,6 @@
 #include <glib/gi18n-lib.h>
 
 #include <gtk/gtk.h>
-#include "gtkprinter.h"
 #include "gtkprinter-private.h"
 
 #include "gtkprintbackendlpr.h"

diff --git a/tests/buildertest.c b/tests/buildertest.c
index 601a5f5bea6c9577275dc9f7f516743818b908d4..de4e080521108aa71d7b5bbbf14098f55cc61620 100644 (file)
--- a/tests/buildertest.c
+++ b/tests/buildertest.c
@@ -26,7 +26,6 @@
 
 #include <gtk/gtk.h>
 #include <gdk/gdkkeysyms.h>
-#include <gtk/gtkprintjob.h>
 
 /* Copied from gtkiconfactory.c; keep in sync! */
 struct _GtkIconSet

diff --git a/tests/defaultvaluetest.c b/tests/defaultvaluetest.c
index 8937aa866522e37c9c355ae4b4ce2df48e5bb420..c88926d9f7fab51cf71b0f871fba0ac7734975a4 100644 (file)
--- a/tests/defaultvaluetest.c
+++ b/tests/defaultvaluetest.c
@@ -22,7 +22,7 @@
 #define GTK_ENABLE_BROKEN
 #include <string.h>
 #include <gtk/gtk.h>
-#include <gtk/gtkprintunixdialog.h>
+#include <gtk/gtkunixprint.h>
 
 static void
 check_property (const char *output,